Merge 2.x to main after 2.4 release #1063
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…oject#731) Signed-off-by: Joshua Li <joshuali925@gmail.com> (cherry picked from commit 1df89e3) Co-authored-by: Joshua Li <joshuali925@gmail.com>
…project#759) * Backport Spring and jackson version bump Signed-off-by: Chen Dai <daichen@amazon.com> * Remove BWC tests (opensearch-project#721) Signed-off-by: Yury Fridlyand <yuryf@bitquilltech.com> Signed-off-by: Chen Dai <daichen@amazon.com> Signed-off-by: Chen Dai <daichen@amazon.com> Signed-off-by: Yury Fridlyand <yuryf@bitquilltech.com> Co-authored-by: Yury-Fridlyand <yuryf@bitquilltech.com>
…nsearch-project#753) Signed-off-by: Yury Fridlyand <yuryf@bitquilltech.com> (cherry picked from commit deececb) Co-authored-by: Yury-Fridlyand <yuryf@bitquilltech.com>
Signed-off-by: Joshua Li <joshuali925@gmail.com>
…opensearch-project#761) Signed-off-by: Joshua Li <joshuali925@gmail.com> (cherry picked from commit e6a5ac9) Co-authored-by: Joshua Li <joshuali925@gmail.com>
…h-project#776) * Bump checkstyle version and fix violations Signed-off-by: Chen Dai <daichen@amazon.com> * Fix checkstyle violations in test code Signed-off-by: Chen Dai <daichen@amazon.com> Signed-off-by: Chen Dai <daichen@amazon.com> (cherry picked from commit 8103d9f) Co-authored-by: Chen Dai <daichen@amazon.com>
…earch-project#797) * Change master timeout to new API Signed-off-by: Chen Dai <daichen@amazon.com> * Change param name to cluster_manager_timeout Signed-off-by: Chen Dai <daichen@amazon.com> Signed-off-by: Chen Dai <daichen@amazon.com> (cherry picked from commit 4e40ed2) Co-authored-by: Chen Dai <daichen@amazon.com>
Signed-off-by: Peng Huo <penghuo@gmail.com>
Merge main to 2.x
Signed-off-by: Peng Huo <penghuo@gmail.com>
…ject#822) Signed-off-by: penghuo <penghuo@gmail.com> Signed-off-by: penghuo <penghuo@gmail.com>
**Reorganize GitHub workflows:** * Remove obsoleve workflows, mostly related to releaseing ODFE artifacts. * Update actions in rest workflows. * Limit workflow scopes: * Reduce file scope, for example, JDBC workflow will be triggered on JDBC changes only. * Reduce action scope, so workflows shouldn't be triggered twice on PR. * Strictly define env version to avoid unexpected failures. * Upload test reports for SQL plugin workflow. * Activate tests for SQL CLI. Signed-off-by: Yury-Fridlyand <yuryf@bitquilltech.com>
…t#847) Signed-off-by: GabeFernandez310 <gabrielf@bitquilltech.com>
* Add create index function in opensearch node client Signed-off-by: Chen Dai <daichen@amazon.com> * Add create index function in opensearch rest client Signed-off-by: Chen Dai <daichen@amazon.com> * Add create index function in OpenSearchIndex table Signed-off-by: Chen Dai <daichen@amazon.com> * Separate index exist API from create index function Signed-off-by: Chen Dai <daichen@amazon.com> * Separate table exist API from create table function Signed-off-by: Chen Dai <daichen@amazon.com> * Add UT and Todo comment for OpenSearch system index Signed-off-by: Chen Dai <daichen@amazon.com> * Fix broken UT in core due to new API in Table interface Signed-off-by: Chen Dai <daichen@amazon.com> * Add more UT and javadoc for OpenSearch data type mapping Signed-off-by: Chen Dai <daichen@amazon.com> * Rename isExist to exists which looks more readable Signed-off-by: Chen Dai <daichen@amazon.com> Signed-off-by: Chen Dai <daichen@amazon.com>
* Add new test workflow. Signed-off-by: Yury-Fridlyand <yuryf@bitquilltech.com>
…ions (opensearch-project#754) * Add implementation of `now`, `sysdate`, `localtime` and similar functions (opensearch-project#92) Signed-off-by: Yury-Fridlyand <yuryf@bitquilltech.com> * Rework on `now` function implementation (opensearch-project#113) Signed-off-by: Yury-Fridlyand <yuryf@bitquilltech.com> * Minor SQL ANTLR clean-up. Signed-off-by: Yury-Fridlyand <yuryf@bitquilltech.com> Signed-off-by: Yury-Fridlyand <yuryf@bitquilltech.com>
Signed-off-by: MaxKsyunz <maxk@bitquilltech.com>
…n-2.13.4 Update com.fasterxml.jackson to 2.13.4 to match opensearch repo.
…ch-project#835) * Add datetime functions `FROM_UNIXTIME` and `UNIX_TIMESTAMP` (opensearch-project#114) * Add implementation for `FROM_UNIXTIME` and `UNIX_TIMESTAMP` functions, UT and IT. Signed-off-by: Yury-Fridlyand <yuryf@bitquilltech.com> * Collent all DateTime formatters into one place. Signed-off-by: Yury-Fridlyand <yuryf@bitquilltech.com> * Rename `DateFormatters` -> `DateTimeFormatters`. Signed-off-by: Yury-Fridlyand <yuryf@bitquilltech.com> Signed-off-by: Yury-Fridlyand <yuryf@bitquilltech.com>
Signed-off-by: Yury-Fridlyand <yuryf@bitquilltech.com>
…nize-workflows Reorganize GitHub workflows.
…ch-project#848) * Added `CONVERT_TZ` to the PPL lexer/parser and the SQL lexer/parser. Signed-off-by: MitchellGale-BitQuill <mitchellg@bitquilltech.com> * Added `convert_tz` to the BuiltinFunctionName.java. Signed-off-by: MitchellGale-BitQuill <mitchellg@bitquilltech.com> * Added convert_tz to DateTimeFunction.java register, private FunctionResolver convert_tz and ExprValue exprConvert_TZ. It implements the functionality for converting between time zones. Signed-off-by: MitchellGale-BitQuill <mitchellg@bitquilltech.com> * Added IT PPL and SQL tests for various conditions including time zones that are outside the existing range (consistent with MySQL standard). Added implementation for convert_tz consistent with MySQL implementation. Signed-off-by: MitchellGale-BitQuill <mitchellg@bitquilltech.com> * Added DATETIME to OpenSearchPPLParser.g4 and OpenSearchSQLParser.g4. Signed-off-by: MitchellGale-BitQuill <mitchellg@bitquilltech.com> * Rebase merge conflict resolution. Signed-off-by: MitchellGale-BitQuill <mitchellg@bitquilltech.com> * Added ppl doctest for convert_tz Signed-off-by: MitchellGale-BitQuill <mitchellg@bitquilltech.com> * Completed implementation for datetime and convert_Tz. Signed-off-by: MitchellGale-BitQuill <mitchellg@bitquilltech.com> * Removed SQL test from PPL IT test Signed-off-by: MitchellGale-BitQuill <mitchellg@bitquilltech.com> * Removed redundant convert to string. Signed-off-by: MitchellGale-BitQuill <mitchellg@bitquilltech.com> * Fixed doctests and reverted changes to adddate function in DateTimeFunctionTest.java. Signed-off-by: MitchellGale-BitQuill <mitchellg@bitquilltech.com> * Fixed doctest. Signed-off-by: MitchellGale-BitQuill <mitchellg@bitquilltech.com> * Fixed doctest. Signed-off-by: MitchellGale-BitQuill <mitchellg@bitquilltech.com> * Added additional integration tests for PPL and SQL tests for convert_tz. Signed-off-by: MitchellGale-BitQuill <mitchellg@bitquilltech.com> * Added null for timezones outside of basic range for DATETIME. Signed-off-by: MitchellGale-BitQuill <mitchellg@bitquilltech.com> * Added test cases for null with the datetime function. Made DateTime function call conevrt_tz function. Signed-off-by: MitchellGale-BitQuill <mitchellg@bitquilltech.com> * Seperated out test from DateTimeFunction.java. Signed-off-by: MitchellGale-BitQuill <mitchellg@bitquilltech.com> * Updated tests. Fixed exception to be less general. Signed-off-by: MitchellGale-BitQuill <mitchellg@bitquilltech.com> * Removed changes. Signed-off-by: MitchellGale-BitQuill <mitchellg@bitquilltech.com> * Fixed rel timezone issue. Signed-off-by: MitchellGale-BitQuill <mitchellg@bitquilltech.com> * Added support for non valid datetime to return null for convert_tz. Signed-off-by: MitchellGale-BitQuill <mitchellg@bitquilltech.com> * Made exception more verbose. Signed-off-by: MitchellGale-BitQuill <mitchellg@bitquilltech.com> * Removed unneeded format changes in DateTimeFunction.java. Signed-off-by: MitchellGale-BitQuill <mitchellg@bitquilltech.com> * Added more doctests. Signed-off-by: MitchellGale-BitQuill <mitchellg@bitquilltech.com> * Removed formatting changes. Signed-off-by: MitchellGale-BitQuill <mitchellg@bitquilltech.com> * Reverting sql/ppl DateTimeFunctionsIT.java. Signed-off-by: MitchellGale-BitQuill <mitchellg@bitquilltech.com> * Reverted changes to DateTimeFunctionTest.java Signed-off-by: MitchellGale-BitQuill <mitchellg@bitquilltech.com> * Added more information about invalid date for convert_tz Signed-off-by: MitchellGale-BitQuill <mitchellg@bitquilltech.com> * Converted "from Field" and "To Field" to use "Fieldn" where n is the field number. Signed-off-by: MitchellGale-BitQuill <mitchellg@bitquilltech.com> * Added date validation. Added test cases in IT to cover cases. Added test in ConvertTZTest.java. Signed-off-by: MitchellGale-BitQuill <mitchellg@bitquilltech.com> * Fixed date validation function. Broke up some unit tests. Signed-off-by: MitchellGale-BitQuill <mitchellg@bitquilltech.com> * Fixed formatting. Signed-off-by: MitchellGale-BitQuill <mitchellg@bitquilltech.com> * Added DateTime tests, broke up functions. Signed-off-by: MitchellGale-BitQuill <mitchellg@bitquilltech.com> * Added space in DateTimeTest.java. Signed-off-by: MitchellGale-BitQuill <mitchellg@bitquilltech.com> * Tidied up code and tests. Signed-off-by: MitchellGale-BitQuill <mitchellg@bitquilltech.com> * Fixed local date time rst test. Signed-off-by: MitchellGale-BitQuill <mitchellg@bitquilltech.com> * Removed nested try/catch exceptions. Signed-off-by: MitchellGale-BitQuill <mitchellg@bitquilltech.com> * removed exprConvertTZ function call from within try catch statement. Signed-off-by: MitchellGale-BitQuill <mitchellg@bitquilltech.com> * Reverted change from parse localdate Signed-off-by: MitchellGale-BitQuill <mitchellg@bitquilltech.com> * Removed extra casting around fromTz variable. Signed-off-by: MitchellGale-BitQuill <mitchellg@bitquilltech.com> * Updated wording for functions.rst Signed-off-by: MitchellGale-BitQuill <mitchellg@bitquilltech.com> * Updated wording for datetime.rst to describe null for conert_tz Signed-off-by: MitchellGale-BitQuill <mitchellg@bitquilltech.com> * Added more test cases for functions.rst Signed-off-by: MitchellGale-BitQuill <mitchellg@bitquilltech.com> * Fixed doctests. Signed-off-by: MitchellGale-BitQuill <mitchellg@bitquilltech.com> * Removed extra import. Signed-off-by: MitchellGale-BitQuill <mitchellg@bitquilltech.com> * Renamed isValidTimeZone function to isValidMySqlTimeZoneId. Signed-off-by: MitchellGale-BitQuill <mitchellg@bitquilltech.com> * Has ExprDatetimeValue doing work for exprConvertTZ call. Signed-off-by: MitchellGale-BitQuill <mitchellg@bitquilltech.com> * Deleted fromTZ Signed-off-by: MitchellGale-BitQuill <mitchellg@bitquilltech.com> * Moved fixed variables to top of class. Signed-off-by: MitchellGale-BitQuill <mitchellg@bitquilltech.com> * Added Null to support of exprDateTime. Signed-off-by: MitchellGale-BitQuill <mitchellg@bitquilltech.com> * Added missing expr functions for makedate/time Signed-off-by: MitchellGale-BitQuill <mitchellg@bitquilltech.com> * cleaning up after rebase merge. Signed-off-by: MitchellGale-BitQuill <mitchellg@bitquilltech.com> * Rebase merge conflict resolution. Signed-off-by: MitchellGale-BitQuill <mitchellg@bitquilltech.com> * Fixed missing DATETIME in SQL Parser. Signed-off-by: MitchellGale-BitQuill <mitchellg@bitquilltech.com> * Fixed IT test. Signed-off-by: MitchellGale-BitQuill <mitchellg@bitquilltech.com> * Addressed PR comments Signed-off-by: MitchellGale-BitQuill <mitchellg@bitquilltech.com> * Added missing variables after rebase Signed-off-by: MitchellGale-BitQuill <mitchellg@bitquilltech.com> * Fixed checkstyle errors after rebase. Signed-off-by: MitchellGale-BitQuill <mitchellg@bitquilltech.com> * Moved formatter for date time over. Signed-off-by: MitchellGale-BitQuill <mitchellg@bitquilltech.com> * Changed function resolved to default Signed-off-by: MitchellGale-BitQuill <mitchellg@bitquilltech.com> * Removed unneeded code Signed-off-by: MitchellGale-BitQuill <mitchellg@bitquilltech.com> Signed-off-by: MitchellGale-BitQuill <mitchellg@bitquilltech.com>
Signed-off-by: Joshua Li <joshuali925@gmail.com> Signed-off-by: Joshua Li <joshuali925@gmail.com>
…ilation errors. (opensearch-project#872) Signed-off-by: forestmvey <forestv@bitquilltech.com>
Signed-off-by: vamsi-amazon <reddyvam@amazon.com>
Signed-off-by: Joshua Li <joshuali925@gmail.com>
…earch-project#870) * Do not remove opensearch from the list of registered catalogs. Signed-off-by: MaxKsyunz <maxk@bitquilltech.com> * New Changes to handle bug:opensearch-project#866 Signed-off-by: vamsi-amazon <reddyvam@amazon.com> Signed-off-by: MaxKsyunz <maxk@bitquilltech.com> Signed-off-by: vamsi-amazon <reddyvam@amazon.com> Co-authored-by: MaxKsyunz <maxk@bitquilltech.com>
…-project#1099) Support opensearch-sql:run Update developer_guide doc. add prometheus and filesystem description. Add .java-version to .gitignore Signed-off-by: Peng Huo <penghuo@gmail.com>
Signed-off-by: vamsi-amazon <reddyvam@amazon.com> Signed-off-by: vamsi-amazon <reddyvam@amazon.com>
…earch-project#1090) * Added Unit Tests Signed-off-by: GabeFernandez310 <gabrielf@bitquilltech.com> * Added Implementation Signed-off-by: GabeFernandez310 <gabrielf@bitquilltech.com> * Added Integration Tests Signed-off-by: GabeFernandez310 <gabrielf@bitquilltech.com> * Added Documentation Signed-off-by: GabeFernandez310 <gabrielf@bitquilltech.com> * Made Changes To Address Failing Checkstyle And Fixed Documentation Signed-off-by: GabeFernandez310 <gabrielf@bitquilltech.com> * Made Changes To Docs Signed-off-by: GabeFernandez310 <gabrielf@bitquilltech.com> * Added IT Test To Compare Alternate Syntaxes Signed-off-by: GabeFernandez310 <gabrielf@bitquilltech.com> * Added Unit Tests Signed-off-by: GabeFernandez310 <gabrielf@bitquilltech.com> * Added Implementation Signed-off-by: GabeFernandez310 <gabrielf@bitquilltech.com> * Added Integration Tests Signed-off-by: GabeFernandez310 <gabrielf@bitquilltech.com> * Added Documentation Signed-off-by: GabeFernandez310 <gabrielf@bitquilltech.com> * Made Changes To Address Failing Checkstyle And Fixed Documentation Signed-off-by: GabeFernandez310 <gabrielf@bitquilltech.com> * Made Changes To Docs Signed-off-by: GabeFernandez310 <gabrielf@bitquilltech.com> * Added IT Test To Compare Alternate Syntaxes Signed-off-by: GabeFernandez310 <gabrielf@bitquilltech.com> * Simplified Documentation Signed-off-by: GabeFernandez310 <gabrielf@bitquilltech.com> Signed-off-by: GabeFernandez310 <gabrielf@bitquilltech.com>
* Add cbrt function to the PPL (opensearch-project#171) Signed-off-by: Margarit Hakobyan <margarith@bitquilltech.com>
…pensearch-project#1103) * Added Tests Signed-off-by: GabeFernandez310 <gabrielf@bitquilltech.com> * Changed Documentation Signed-off-by: GabeFernandez310 <gabrielf@bitquilltech.com> * Added Implementation. Signed-off-by: GabeFernandez310 <gabrielf@bitquilltech.com> * Modified Documentation Signed-off-by: GabeFernandez310 <gabrielf@bitquilltech.com> Signed-off-by: GabeFernandez310 <gabrielf@bitquilltech.com>
Signed-off-by: GabeFernandez310 <gabrielf@bitquilltech.com>
Signed-off-by: GabeFernandez310 <gabrielf@bitquilltech.com>
Signed-off-by: GabeFernandez310 <gabrielf@bitquilltech.com>
…t#1102) * Adding alternate multi_match syntax. Signed-off-by: forestmvey <forestv@bitquilltech.com> * Adding documentation for alternate multi-match syntax options. Signed-off-by: forestmvey <forestv@bitquilltech.com> Signed-off-by: forestmvey <forestv@bitquilltech.com>
POSITION function is a synonym to LOCATE. It's syntax is POSITION(<substr> IN <string>) Signed-off-by: Margarit Hakobyan <margarith@bitquilltech.com>
Signed-off-by: Peng Huo <penghuo@gmail.com>
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
Comment on lines
+27
to
+38
| "%\\{" | ||
| + "(?<name>" | ||
| + "(?<pattern>[A-z0-9]+)" | ||
| + "(?::(?<subname>[A-z0-9_:;,\\-\\/\\s\\.']+))?" | ||
| + ")" | ||
| + "(?:=(?<definition>" | ||
| + "(?:" | ||
| + "(?:[^{}]+|\\.+)+" | ||
| + ")+" | ||
| + ")" | ||
| + ")?" | ||
| + "\\}"); |
Check failure
Code scanning / CodeQL
Inefficient regular expression
Comment on lines
+27
to
+38
| "%\\{" | ||
| + "(?<name>" | ||
| + "(?<pattern>[A-z0-9]+)" | ||
| + "(?::(?<subname>[A-z0-9_:;,\\-\\/\\s\\.']+))?" | ||
| + ")" | ||
| + "(?:=(?<definition>" | ||
| + "(?:" | ||
| + "(?:[^{}]+|\\.+)+" | ||
| + ")+" | ||
| + ")" | ||
| + ")?" | ||
| + "\\}"); |
Check failure
Code scanning / CodeQL
Inefficient regular expression
| public class GrokCompiler implements Serializable { | ||
|
|
||
| // We don't want \n and commented line | ||
| private static final Pattern patternLinePattern = Pattern.compile("^([A-z0-9_]+)\\s+(.*)$"); |
Check warning
Code scanning / CodeQL
Overly permissive regular expression range
Comment on lines
+27
to
+38
| "%\\{" | ||
| + "(?<name>" | ||
| + "(?<pattern>[A-z0-9]+)" | ||
| + "(?::(?<subname>[A-z0-9_:;,\\-\\/\\s\\.']+))?" | ||
| + ")" | ||
| + "(?:=(?<definition>" | ||
| + "(?:" | ||
| + "(?:[^{}]+|\\.+)+" | ||
| + ")+" | ||
| + ")" | ||
| + ")?" | ||
| + "\\}"); |
Check warning
Code scanning / CodeQL
Overly permissive regular expression range
Comment on lines
+27
to
+38
| "%\\{" | ||
| + "(?<name>" | ||
| + "(?<pattern>[A-z0-9]+)" | ||
| + "(?::(?<subname>[A-z0-9_:;,\\-\\/\\s\\.']+))?" | ||
| + ")" | ||
| + "(?:=(?<definition>" | ||
| + "(?:" | ||
| + "(?:[^{}]+|\\.+)+" | ||
| + ")+" | ||
| + ")" | ||
| + ")?" | ||
| + "\\}"); |
Check warning
Code scanning / CodeQL
Overly permissive regular expression range
Signed-off-by: Peng Huo <penghuo@gmail.com>
* Add position() string function to PPL (opensearch-project#184) Signed-off-by: Margarit Hakobyan <margarith@bitquilltech.com>
…pensearch-project#1091) * Add new table scan builder and optimizer rules Signed-off-by: Chen Dai <daichen@amazon.com> * Fix jacoco test coverage Signed-off-by: Chen Dai <daichen@amazon.com> * Update javadoc with more details Signed-off-by: Chen Dai <daichen@amazon.com> * Fix highlight pushdown issue Signed-off-by: Chen Dai <daichen@amazon.com> * Rename new class more properly Signed-off-by: Chen Dai <daichen@amazon.com> * Fix default sort by doc issue Signed-off-by: Chen Dai <daichen@amazon.com> * Rename visit method and javadoc Signed-off-by: Chen Dai <daichen@amazon.com> * Move table scan builder and optimize rule to read package Signed-off-by: Chen Dai <daichen@amazon.com> * Fix sort push down issue Signed-off-by: Chen Dai <daichen@amazon.com> * Move sortByFields to parent scan builder Signed-off-by: Chen Dai <daichen@amazon.com> * Add back old test Signed-off-by: Chen Dai <daichen@amazon.com> Signed-off-by: Chen Dai <daichen@amazon.com>
…-project#156) (opensearch-project#1108) Signed-off-by: Guian Gumpac <guiang@bitquilltech.com>
* Add reverse() string function to V2 SQL engine Signed-off-by: Margarit Hakobyan <margarith@bitquilltech.com>
…arch-project#1150) Signed-off-by: Andriy Redko <andriy.redko@aiven.io> Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
6 tasks
Signed-off-by: Peng Huo <penghuo@gmail.com>
Signed-off-by: opensearch-ci-bot <opensearch-infra@amazon.com> Signed-off-by: opensearch-ci-bot <opensearch-infra@amazon.com> Co-authored-by: opensearch-ci-bot <opensearch-infra@amazon.com>
Collaborator
Author
|
Pending on opensearch-project/opensearch-build#2999. |
Signed-off-by: Peng Huo <penghuo@gmail.com>
Collaborator
Author
|
Ignore CodeQL issue. Tracking in #1168. |
dai-chen
approved these changes
Dec 13, 2022
acarbonetto
approved these changes
Dec 13, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
15 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Merge 2.x to main after 2.4 release.
Check List
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.